core: Add -U option for checkout to skip lchown() and xattrs

This is useful for checking out an OS filesystem tree as a regular
user, and not caring about /dev and stuff.

diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index 7c9ef1161c28c959fc00fa4ff7b53dc142499fe6..9f313c3ac29fb828c8ba226556d4999489a54d6e 100644 (file)
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -1968,8 +1968,45 @@ ostree_repo_load_variant (OstreeRepo *self,
   return ret;
 }
 
+static gboolean
+checkout_file_from_input (GFile          *file,
+                          OstreeRepoCheckoutMode mode,
+                          GFileInfo      *finfo,
+                          GVariant       *xattrs,
+                          GInputStream   *input,
+                          GCancellable   *cancellable,
+                          GError        **error)
+{
+  gboolean ret = FALSE;
+  GFileInfo *temp_info = NULL;
+
+  if (mode == OSTREE_REPO_CHECKOUT_MODE_USER)
+    {
+      if (g_file_info_get_file_type (finfo) == G_FILE_TYPE_SPECIAL)
+        return TRUE;
+
+      temp_info = g_file_info_dup (finfo);
+      
+      g_file_info_set_attribute_uint32 (temp_info, "unix::uid", geteuid ());
+      g_file_info_set_attribute_uint32 (temp_info, "unix::gid", getegid ());
+
+      xattrs = NULL;
+    }
+
+  if (!ostree_create_file_from_input (file, temp_info ? temp_info : finfo,
+                                      xattrs, input, OSTREE_OBJECT_TYPE_FILE,
+                                      NULL, cancellable, error))
+    goto out;
+
+  ret = TRUE;
+ out:
+  g_clear_object (&temp_info);
+  return ret;
+}
+
 static gboolean
 checkout_tree (OstreeRepo    *self,
+               OstreeRepoCheckoutMode mode,
                OstreeRepoFile *dir,
                const char      *destination,
                GCancellable    *cancellable,
@@ -1977,6 +2014,7 @@ checkout_tree (OstreeRepo    *self,
 
 static gboolean
 checkout_one_directory (OstreeRepo  *self,
+                        OstreeRepoCheckoutMode mode,
                         const char *destination,
                         const char *dirname,
                         OstreeRepoFile *dir,
@@ -1995,15 +2033,22 @@ checkout_one_directory (OstreeRepo  *self,
   if (!_ostree_repo_file_get_xattrs (dir, &xattr_variant, NULL, error))
     goto out;
 
-  if (!ostree_create_file_from_input (dest_file, dir_info,
-                                      xattr_variant,
-                                      NULL,
-                                      OSTREE_OBJECT_TYPE_FILE,
-                                      NULL,
-                                      cancellable, error))
+  if (!checkout_file_from_input (dest_file, mode, dir_info,
+                                 xattr_variant,
+                                 NULL,
+                                 cancellable, error))
     goto out;
 
-  if (!checkout_tree (self, dir, dest_path, cancellable, error))
+  if (mode != OSTREE_REPO_CHECKOUT_MODE_USER)
+    {
+      if (!_ostree_repo_file_get_xattrs (dir, &xattr_variant, NULL, error))
+        goto out;
+      
+      if (!ostree_set_xattrs (dest_file, xattr_variant, cancellable, error))
+        goto out;
+    }
+      
+  if (!checkout_tree (self, mode, dir, dest_path, cancellable, error))
     goto out;
 
   ret = TRUE;
@@ -2016,6 +2061,7 @@ checkout_one_directory (OstreeRepo  *self,
 
 static gboolean
 checkout_tree (OstreeRepo    *self,
+               OstreeRepoCheckoutMode mode,
                OstreeRepoFile *dir,
                const char      *destination,
                GCancellable    *cancellable,
@@ -2054,7 +2100,7 @@ checkout_tree (OstreeRepo    *self,
 
       if (type == G_FILE_TYPE_DIRECTORY)
         {
-          if (!checkout_one_directory (self, destination, name, (OstreeRepoFile*)child, file_info, cancellable, error))
+          if (!checkout_one_directory (self, mode, destination, name, (OstreeRepoFile*)child, file_info, cancellable, error))
             goto out;
         }
       else
@@ -2070,11 +2116,8 @@ checkout_tree (OstreeRepo    *self,
                                              cancellable, error))
                 goto out;
 
-              if (!ostree_create_file_from_input (dest_path, file_info, packed_xattrs,
-                                                  packed_input,
-                                                  OSTREE_OBJECT_TYPE_FILE,
-                                                  NULL,
-                                                  cancellable, error))
+              if (!checkout_file_from_input (dest_path, mode, file_info, packed_xattrs,
+                                             packed_input, cancellable, error))
                 goto out;
             }
           else
@@ -2091,6 +2134,8 @@ checkout_tree (OstreeRepo    *self,
       g_clear_object (&dest_path);
       g_clear_object (&file_info);
       g_clear_object (&child);
+      g_clear_object (&packed_input);
+      ot_clear_gvariant (&packed_xattrs);
     }
   if (file_info == NULL && temp_error != NULL)
     {
@@ -2114,6 +2159,7 @@ checkout_tree (OstreeRepo    *self,
 
 gboolean
 ostree_repo_checkout (OstreeRepo *self,
+                      OstreeRepoCheckoutMode mode,
                       const char   *rev,
                       const char   *destination,
                       GCancellable *cancellable,
@@ -2145,7 +2191,7 @@ ostree_repo_checkout (OstreeRepo *self,
   if (!root_info)
     goto out;
 
-  if (!checkout_one_directory (self, destination, NULL, root, root_info, cancellable, error))
+  if (!checkout_one_directory (self, mode, destination, NULL, root, root_info, cancellable, error))
     goto out;
 
   ret = TRUE;

diff --git a/src/libostree/ostree-repo.h b/src/libostree/ostree-repo.h
index d250afef310d8a37fecd95d5f904effabfc6689f..8b929c509b6f8cfbb7e0cf57db52b1705211aa82 100644 (file)
--- a/src/libostree/ostree-repo.h
+++ b/src/libostree/ostree-repo.h
@@ -131,7 +131,13 @@ gboolean      ostree_repo_commit_tarfile (OstreeRepo   *self,
                                           GCancellable *cancellable,
                                           GError      **error);
 
+typedef enum {
+  OSTREE_REPO_CHECKOUT_MODE_NONE,
+  OSTREE_REPO_CHECKOUT_MODE_USER
+} OstreeRepoCheckoutMode;
+
 gboolean      ostree_repo_checkout (OstreeRepo *self,
+                                    OstreeRepoCheckoutMode mode,
                                     const char   *ref,
                                     const char   *destination,
                                     GCancellable   *cancellable,

diff --git a/src/ostree/ot-builtin-checkout.c b/src/ostree/ot-builtin-checkout.c
index 90493fc67d3c416650857493d130b1837a82b571..024b1080147b76a99152199eee7426f5b0c70414 100644 (file)
--- a/src/ostree/ot-builtin-checkout.c
+++ b/src/ostree/ot-builtin-checkout.c
@@ -27,7 +27,10 @@
 
 #include <glib/gi18n.h>
 
+static gboolean user_mode;
+
 static GOptionEntry options[] = {
+  { "user-mode", 'U', 0, G_OPTION_ARG_NONE, &user_mode, "Do not change file ownership or initialze extended attributes", NULL },
   { NULL }
 };
 
@@ -65,7 +68,8 @@ ostree_builtin_checkout (int argc, char **argv, const char *repo_path, GError **
   commit = argv[1];
   destination = argv[2];
   
-  if (!ostree_repo_checkout (repo, commit, destination, NULL, error))
+  if (!ostree_repo_checkout (repo, user_mode ? OSTREE_REPO_CHECKOUT_MODE_USER : 0,
+                             commit, destination, NULL, error))
     goto out;
 
   ret = TRUE;

diff --git a/src/ostree/ot-builtin-compose.c b/src/ostree/ot-builtin-compose.c
index 2f1c4eb5204cb8ebb562526065fb0a5e87dbd273..bfda89b643ef6c1f44088b0d06405f269f253594 100644 (file)
--- a/src/ostree/ot-builtin-compose.c
+++ b/src/ostree/ot-builtin-compose.c
@@ -98,7 +98,8 @@ compose_branch_on_dir (OstreeRepo *repo,
   branchf = ot_gfile_new_for_path (branchpath);
 
   g_print ("Checking out %s (commit %s)...\n", branch, branchrev);
-  if (!ostree_repo_checkout (repo, branchrev, branchpath, NULL, error))
+  if (!ostree_repo_checkout (repo, OSTREE_REPO_CHECKOUT_MODE_NONE,
+                             branchrev, branchpath, NULL, error))
     goto out;
   g_print ("...done\n");
   g_print ("Merging over destination...\n");